Backport bug fixes for 7.0.1 release #562
+189
−25
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.